Modified Folder Names

I modified folder names so we can use them in the makefile
I flushed out Entity and ran a test compliation.
Entity.cpp is now compiling without errors. Not finished flushing out
the class though.