Restructure folder structure
put stuff in their right place