Fixed guidelines and more files