altered folder structure (not all references changed yet)