Moved some model files to their proper locaitons