Directory restructure & cleanup.