updated class inclusion

updated class inclusion according to module developer guidelines
refactor file en var names