Refactor, change some classes and files of package
OnlyClassInOnlyOnedirectory Test completed