Moving things around, deleting stuff

Adding compile options and flags