Hopefully rearranged the makefiles to allow for easier expansion for next generation devices.