File organization, more work on backend