Patch: Changes directory structure to more userful one
Update: Changes directory structure for the better