moved class in separate files for better js including