general: updated folder structure