Cleaned up code

I removed all the old code comments and removed some empty statements and changed the directory structure a bit. See the readme in my fork to see my intentions.