Restructured paths to fit future package name
Changed the package name of the three class files