Reorganized project strucutre