rearranged folders and added some menu stuff