Right folder structure [fixed #3]