Organizing the folder structure for pre-release 2
fixing