Modularizing this project  - Creating core project