Implement expected behavior / organize files