Actually replace include statements with content
Fix directory issues