Clean code & Fix include paths and names