First commit

finally stabilized after moving files