Rename classes according to architecture plan
Rearrange files