Reorganized all files and rebased