Modified the make files and moved them all into the make folder