Cleanup

Change the structure of the master branch and delete unnecessary code. Next is to separate some of the code into branches.