update src structure
correct non loader issues
restructure test fixtures