File cleanup and renaming
Better imports organization
Undoing inline require statements