Revert "Complete 2.5d blocks, spikes, & folder orginize"

This reverts commit d6bfc6dd66107d30dad64dbb6d1e3fb2c3308f6a.