Reorganize Module structure to make it work under windows