initial commit of the correct structure