Directory structure was changed and some duplicit files removed.