Revert "breaking a lot of stuff to reduce the overall file size"

This reverts commit 09f659c63b451b52052c9b36cc014e8416ab3039.