last part of restructuring

now onto sub-projects ... oh well