almost finish 2
Files and classes organized.