Cleaned project

Organised imports, removed unnecessary.