Changed project structure and layed files in packages.