no need to split promises
simplified file structure
fixing dependencies