Some refactorings..
Merge branch 'master' of https://mterwoord@github.com/CosmosOS/Cosmos.git