Separation of Classes

wooo
New files