Migrating

new folders and style fixes