Rearranged project structure.