Restructure of directories.
Working towards request uri processing.