Less divided onto modules

References #52