Reconstructed app to make it more modular
updated readme