fixed routing issues, removed nested resources