Added forgotten files and deleted some useless