Initial System Structuring

Lets keep things more organized