Re-organized, changed main.cpp header call to colour
re-organized into sub-directories