new init commit
re-structure