Almost full refactor
Package renamed