Module separation; Settings cleanup