Rewrites directories & refactored things