Restructure project to use frameworks