Refactored map into its own class, fixed asset library