Removed wrongly placed files
Added missing files