Testing and organizing

Testing and removed unused imports in all files