organized files. added rack
merge changes