re-organized files, most basic functionality working