Changed the import section of all files, and some refactorings were made.