Directories organization
References of software/ removed
Deploy script improvements