Refactorized some files, added minimap