re-struct syteup files/folders hierarchy - part 2