renamed and rearrenged

folders and packages