bugfixes
added de-activation hooks
separating classes into files again