Reorganised project and fixed errors
More reoganising/fixing