Reorganizing structure; refactoring to conform to standards