Moved some files and changed some styles