File Structure Commit

Updates the structure of the files to clean up base.js