Moved files around
Makefile for resources
Some typedefs