too many changes...

start of the new file structure + flourish framework