Reorganize project modules