Changed name main folder, bug fixing, updated read me