Reduced code to only what is really necessary. Also combined most of the packages into one.

Signed-off-by: Michael Fabian Dirks <hellbirdxjun@gmail.com>