Moved everything to the "main" package