Project restructuring

Moved some files around for better module management.