Changed alot of things, created directories