Edited code and changed package structure. Completed README