Added #defines to .h files and moved a lot of files around