Cleanup

Cleaned up files and sorted into directories