Feature/move old into new structure

re-organized project structure to be more modular