Refactor setup

This will make expanding an app way easier