Cleaned up file structure