added new framework, new design and new file structure