rearranged project structure