Moved some files and removed unecessary imports
changed the icons and small fixes