Restructure directory structure