Organization

Separated the 3 big components into separate folders