rearranged project and set up