Changed package structure, updated README