cleaned up file structure