File structure

Moved to src