Removed nested file structure