changed folder and package structure