1. |Altered the folder structure of the packages.
2. |Changed the imports and packages of the source files