Reorganized sub project