Big Update v3.0

Removed unnecessary files and cleaned up code
simplified structure