Reorganized codebase pt 2
reorganized codebase pt3