Final V_1.1

Distributed into more classes