Rearranged Project structure