first changes and some file movements - work in progress