Made package management more intelligent; Fixed wrongly placed package