Removed old beans, moved utils and beans to correct package