Moved stuff around, project not mature enough for any real comments

Also, compile errors exist still. Just backing it up.