Modularization

Just splitting stuff up.
Recompiled and what not.