-Cleaned up file structure