Refactored workspace

Moves source code into own related folders