removing code from application.go
remvoing application.go
cleanup
renaming type and making easier to use