changed folder structure + code cleanup