Update project structure, add fixtures and stuff