Clean up directories and includes