clean up
changed structure
installer scipt