Updated file paths to new entities directory, removed unwanted sample entity properties