Fixes for file structuring