Tons of reorganization

I hope github doesn't shit itself!