Cleanup

This branch focus on code cleanup. This commit add a settings module to load custom settings.