Fixed level generation and started decoupling of everything