Directory structure

Added in the DIR variable to make sure the clean up is better.