Menu, loading, and package refactor