Now working with states. Removed unnecessary files