Moved non-gui parts to their own dir.