More Refactoring

Refactoring Model in to a seperate package, hoping to find a way so that
View is only able to read the model, not modify it anyhow.