Cleaning the package and moving to src folder