cleaned up file hierarchy