Moved classes to their files
Progress, refactoring
Adapted to newest libs