Major updates in all files and reorganization