portfolio fixes, folders rearranged