Revert "Revert "Updated Rakefile""

This reverts commit cff4f939137ba9e1aa00806e3be6566285ea2abe.
Revert "Updated Rakefile"

This reverts commit d4218d4a5d890043ce4125b62a4b042781e3c600.
Revert "Removed submodules"

This reverts commit d7c224e912c938dff43347722fc4ee1a56a9f388.
Fixed merged files