Moved everything into same package