First commit of new dev structure