Few changes to the Make process
Some moving around
Some moving around
Some restructuring
Some restructuring