implemented
package refactoring
added enabled indicator + minor changes