Added layout, moved files

Moved some files around, added basic layout, no angular hookup yet.