project structure / naming refactor
lesser changes