Restructure
Tests Folder
Cleanup