[cleanup] Moved some methods around that made sense, cleaned up content loading as to use only one ContentManager

Signed-off-by: Gabriel Reiser <greiser@cardfree.com>