changed package structure of the project to organize things