data restructuring
implemented model view setup