Rearranged project structure. Major change.