restructure
changing
layer stuff
got importing working
minor
got pure prediction working
Merging features/integration into master.