Reorganize code and add settings