Updated files and package structure