Code style
Move modules to lib/ subfolder