Re-organised later commit into src folder. All components bar some file helpers are present, though none functional