Changed package structure and updated README