I put all the class in to a Model folder

I hope this will make merging to the main dev less painfull