US45-Integrate all classes into Main Class

Fixing issues of instances