Updated directory structure, created includes