windows compatibility
refractoring
clean up the folder architecture
remove some useless whitespaces