Forgot about the deleted files. Still merging manually branches test and basics
Final merge with deleted files