Edited package structure
Fixed package issues. NoteTests now run successfully