[FEATURE] Enable 'disable' functionality

Close #3, make some structure changes