Reorganize project into sane directories