Code cleanup, now all files have relative imports and urls no longer cares about user assigned namespace