seperated everything into an app