cleaned up file structure'