moving files in preparation for new make build system
fixed file dependencies, tested each problem again