Cleaning up file structure, and adding base.