organized folder structure, added basic menu