cleaned up file structure and duplication