New directory structure
Fixed moved paths and slightly refactored Makefile