Project restructuring, new folder structure, adjusted tab distance, cycling debug messages controlled through macro