organizes files
fix files organization
small refactoring