reogranised code into core folder and modified make paths to point to the core code (simpler development and greater consistency)