Revert "further dir and build changes"

This reverts commit e9e69d7559b0d96fe4f9ee61440b99ec29a266ce.
Revert "changed names and directories"

This reverts commit ea4c4f5d8f5a3fdc7c54c34274d777a33d7c2752.
build changes, protobuf still works
dir changes finished and everything seems to work just fine