Tidied up code
Merged resolve and scanning
Completed build system structure