Reorganized files structure (one class in one file) and cleaned code.