Rearranged project structure