From e31b7a40a6a2304bf8d08cb8b5070876be1f724f Mon Sep 17 00:00:00 2001
From: Taras Machyshyn <taras@letrium.com>
Date: Mon, 18 Nov 2013 16:40:41 +0200
Subject: [PATCH] added Resources dir for metadata, layouts. Upper camel case
 for entity filenames of metadata, layouts

---
 .gitignore                                     | 12 ++++++------
 application/Espo/Core/Application.php          | 18 +++++++++++-------
 .../Espo/Core/defaults/systemConfig.php        |  8 ++++----
 .../layouts/App}/settings.json                 |  0
 .../layouts/Home}/dashlets.json                |  0
 .../layouts/OutboundEmail}/detail.json         |  0
 .../layouts/Preferences}/detail.json           |  0
 .../layouts/Role}/relationships.json           |  0
 .../layouts/Settings}/outboundEmail.json       |  0
 .../layouts/Settings}/settings.json            |  0
 .../layouts/Settings}/userInterface.json       |  0
 .../layouts/Team}/relationships.json           |  0
 .../layouts/User}/detail.json                  |  0
 .../layouts/User}/detailSmall.json             |  0
 .../layouts/User}/filters.json                 |  0
 .../layouts/User}/filtersAdvanced.json         |  0
 .../user => Resources/layouts/User}/list.json  |  0
 .../layouts/User}/listSmall.json               |  0
 .../layouts/User}/massUpdate.json              |  0
 .../metadata/app/AdminPanel.json}              |  0
 .../metadata}/dashlets/Stream.json             |  0
 .../metadata}/defs/Bug.json                    |  0
 .../metadata}/defs/User.json                   |  0
 .../metadata}/entityDefs/Attachment.json       |  0
 .../metadata}/entityDefs/EmailTemplate.json    |  0
 .../metadata}/entityDefs/Note.json             |  0
 .../metadata}/entityDefs/OutboundEmail.json    |  0
 .../metadata}/entityDefs/Preferences.json      |  0
 .../metadata}/entityDefs/Role.json             |  0
 .../metadata}/entityDefs/Settings.json         |  0
 .../metadata}/entityDefs/Team.json             |  0
 .../metadata}/entityDefs/User.json             |  0
 .../metadata}/fields/address.json              |  0
 .../metadata}/fields/array.json                |  0
 .../metadata}/fields/autoincrement.json        |  0
 .../metadata}/fields/base.json                 |  0
 .../metadata}/fields/bool.json                 |  0
 .../metadata}/fields/currency.json             |  0
 .../metadata}/fields/date.json                 |  0
 .../metadata}/fields/datetime.json             |  0
 .../metadata}/fields/email.json                |  0
 .../metadata}/fields/enum.json                 |  0
 .../metadata}/fields/enumInt.json              |  0
 .../metadata}/fields/float.json                |  0
 .../metadata}/fields/int.json                  |  0
 .../metadata}/fields/link.json                 |  0
 .../metadata}/fields/linkMultiple.json         |  0
 .../metadata}/fields/linkParent.json           |  0
 .../metadata}/fields/multienum.json            |  0
 .../metadata}/fields/password.json             |  0
 .../metadata}/fields/personName.json           |  0
 .../metadata}/fields/phone.json                |  0
 .../metadata}/fields/text.json                 |  0
 .../metadata}/fields/url.json                  |  0
 .../metadata}/fields/varchar.json              |  0
 .../metadata}/scopes/Attachment.json           |  0
 .../metadata}/scopes/EmailTemplate.json        |  0
 .../metadata}/scopes/Note.json                 |  0
 .../metadata}/scopes/OutboundEmail.json        |  0
 .../metadata}/scopes/Role.json                 |  0
 .../metadata}/scopes/Team.json                 |  0
 .../metadata}/scopes/User.json                 |  0
 .../metadata}/viewDefs/EmailTemplate.json      |  0
 .../metadata}/viewDefs/OutboundEmail.json      |  0
 .../metadata}/viewDefs/Role.json               |  0
 .../metadata}/viewDefs/Team.json               |  0
 .../metadata}/viewDefs/User.json               |  0
 .../layouts/Account}/detail.json               |  0
 .../layouts/Account}/detailSmall.json          |  0
 .../layouts/Account}/filters.json              |  0
 .../layouts/Account}/filtersAdvanced.json      |  0
 .../layouts/Account}/list.json                 |  0
 .../layouts/Account}/listSelect.json           |  0
 .../layouts/Account}/listSmall.json            |  0
 .../layouts/Account}/massUpdate.json           |  0
 .../layouts/Account}/relationships.json        |  0
 .../layouts/Call}/detail.json                  |  0
 .../layouts/Call}/detailSmall.json             |  0
 .../layouts/Call}/filtersAdvanced.json         |  0
 .../call => Resources/layouts/Call}/list.json  |  0
 .../layouts/Call}/listSelect.json              |  0
 .../layouts/Call}/listSmall.json               |  0
 .../layouts/Call}/massUpdate.json              |  0
 .../layouts/Case}/detail.json                  |  0
 .../layouts/Case}/detailSmall.json             |  0
 .../layouts/Case}/filters.json                 |  0
 .../layouts/Case}/filtersAdvanced.json         |  0
 .../case => Resources/layouts/Case}/list.json  |  0
 .../layouts/Case}/listSmall.json               |  0
 .../layouts/Case}/massUpdate.json              |  0
 .../layouts/Case}/relationships.json           |  0
 .../layouts/Contact}/detail.json               |  0
 .../layouts/Contact}/detailSmall.json          |  0
 .../layouts/Contact}/filters.json              |  0
 .../layouts/Contact}/filtersAdvanced.json      |  0
 .../layouts/Contact}/list.json                 |  0
 .../layouts/Contact}/listSelect.json           |  0
 .../layouts/Contact}/listSmall.json            |  0
 .../layouts/Contact}/relationships.json        |  0
 .../layouts/Email}/detail.json                 |  0
 .../layouts/Email}/detailSmall.json            |  0
 .../layouts/EmailTemplate}/detail.json         |  0
 .../layouts/EmailTemplate}/detailSmall.json    |  0
 .../EmailTemplate}/filtersAdvanced.json        |  0
 .../layouts/InboundEmail}/detail.json          |  0
 .../layouts/InboundEmail}/list.json            |  0
 .../layouts/Lead}/detail.json                  |  0
 .../layouts/Lead}/detailSmall.json             |  0
 .../layouts/Lead}/filters.json                 |  0
 .../layouts/Lead}/filtersAdvanced.json         |  0
 .../lead => Resources/layouts/Lead}/list.json  |  0
 .../layouts/Lead}/listDashlet.json             |  0
 .../layouts/Lead}/listSelect.json              |  0
 .../layouts/Lead}/listSmall.json               |  0
 .../layouts/Lead}/massUpdate.json              |  0
 .../layouts/Lead}/relationships.json           |  0
 .../layouts/Meeting}/detail.json               |  0
 .../layouts/Meeting}/detailSmall.json          |  0
 .../layouts/Meeting}/filtersAdvanced.json      |  0
 .../layouts/Meeting}/list.json                 |  0
 .../layouts/Meeting}/listSelect.json           |  0
 .../layouts/Meeting}/listSmall.json            |  0
 .../layouts/Meeting}/massUpdate.json           |  0
 .../layouts/Opportunity}/detail.json           |  0
 .../layouts/Opportunity}/detailSmall.json      |  0
 .../layouts/Opportunity}/filtersAdvanced.json  |  0
 .../layouts/Opportunity}/list.json             |  0
 .../layouts/Opportunity}/listSelect.json       |  0
 .../layouts/Opportunity}/listSmall.json        |  0
 .../layouts/Opportunity}/massUpdate.json       |  0
 .../layouts/Opportunity}/relationships.json    |  0
 .../layouts/Prospect}/detail.json              |  0
 .../layouts/Prospect}/detailSmall.json         |  0
 .../layouts/Prospect}/filters.json             |  0
 .../layouts/Prospect}/filtersAdvanced.json     |  0
 .../layouts/Prospect}/list.json                |  0
 .../layouts/Prospect}/listSmall.json           |  0
 .../layouts/Prospect}/massUpdate.json          |  0
 .../layouts/Prospect}/relationships.json       |  0
 .../layouts/Task}/detail.json                  |  0
 .../layouts/Task}/detailSmall.json             |  0
 .../layouts/Task}/filtersAdvanced.json         |  0
 .../task => Resources/layouts/Task}/list.json  |  0
 .../layouts/Task}/listSelect.json              |  0
 .../layouts/Task}/listSmall.json               |  0
 .../layouts/Task}/massUpdate.json              |  0
 .../layouts/Task}/relationships.json           |  0
 .../metadata}/dashlets/Calendar.json           |  0
 .../metadata}/dashlets/Cases.json              |  0
 .../metadata}/dashlets/Leads.json              |  0
 .../metadata}/dashlets/Opportunities.json      |  0
 .../dashlets/OpportunitiesByLeadSource.json    |  0
 .../dashlets/OpportunitiesByStage.json         |  0
 .../metadata}/dashlets/SalesByMonth.json       |  0
 .../metadata}/dashlets/SalesPipeline.json      |  0
 .../metadata}/dashlets/Tasks.json              |  0
 .../metadata}/defs/Contact.json                |  0
 .../metadata}/defs/Product.json                |  0
 .../metadata}/defs/unset.json                  |  0
 .../metadata}/entityDefs/Account.json          |  0
 .../metadata}/entityDefs/Call.json             |  0
 .../metadata}/entityDefs/Case.json             |  0
 .../metadata}/entityDefs/Contact.json          |  0
 .../metadata}/entityDefs/Email.json            |  0
 .../metadata}/entityDefs/InboundEmail.json     |  0
 .../metadata}/entityDefs/Lead.json             |  0
 .../metadata}/entityDefs/Meeting.json          |  0
 .../metadata}/entityDefs/Opportunity.json      |  0
 .../metadata}/entityDefs/Prospect.json         |  0
 .../metadata}/entityDefs/Task.json             |  0
 .../metadata}/scopes/Account.json              |  0
 .../metadata}/scopes/Calendar.json             |  0
 .../metadata}/scopes/Call.json                 |  0
 .../metadata}/scopes/Case.json                 |  0
 .../metadata}/scopes/Contact.json              |  0
 .../metadata}/scopes/Email.json                |  0
 .../metadata}/scopes/InboundEmail.json         |  0
 .../metadata}/scopes/Lead.json                 |  0
 .../metadata}/scopes/Meeting.json              |  0
 .../metadata}/scopes/Opportunity.json          |  0
 .../metadata}/scopes/Prospect.json             |  0
 .../metadata}/scopes/Task.json                 |  0
 .../metadata}/viewDefs/Account.json            |  0
 .../metadata}/viewDefs/Call.json               |  0
 .../metadata}/viewDefs/Case.json               |  0
 .../metadata}/viewDefs/Contact.json            |  0
 .../metadata}/viewDefs/InboundEmail.json       |  0
 .../metadata}/viewDefs/Lead.json               |  0
 .../metadata}/viewDefs/Meeting.json            |  0
 .../metadata}/viewDefs/Opportunity.json        |  0
 .../metadata}/viewDefs/Prospect.json           |  0
 .../metadata}/viewDefs/Task.json               |  0
 tests/Api/LayoutTest.php                       |  4 ++--
 tests/Api/MetadataTest.php                     |  4 ++--
 194 files changed, 25 insertions(+), 21 deletions(-)
 rename application/Espo/{Layouts/app => Resources/layouts/App}/settings.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Layouts/home => Resources/layouts/Home}/dashlets.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Layouts/outboundEmail => Resources/layouts/OutboundEmail}/detail.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Layouts/preferences => Resources/layouts/Preferences}/detail.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Layouts/role => Resources/layouts/Role}/relationships.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Layouts/settings => Resources/layouts/Settings}/outboundEmail.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Layouts/settings => Resources/layouts/Settings}/settings.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Layouts/settings => Resources/layouts/Settings}/userInterface.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Layouts/team => Resources/layouts/Team}/relationships.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Layouts/user => Resources/layouts/User}/detail.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Layouts/user => Resources/layouts/User}/detailSmall.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Layouts/user => Resources/layouts/User}/filters.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Layouts/user => Resources/layouts/User}/filtersAdvanced.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Layouts/user => Resources/layouts/User}/list.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Layouts/user => Resources/layouts/User}/listSmall.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Layouts/user => Resources/layouts/User}/massUpdate.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Metadata/app/adminPanel.json => Resources/metadata/app/AdminPanel.json} (100%)
 mode change 100755 => 100644
 rename application/Espo/{Metadata => Resources/metadata}/dashlets/Stream.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Metadata => Resources/metadata}/defs/Bug.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Metadata => Resources/metadata}/defs/User.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Metadata => Resources/metadata}/entityDefs/Attachment.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Metadata => Resources/metadata}/entityDefs/EmailTemplate.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Metadata => Resources/metadata}/entityDefs/Note.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Metadata => Resources/metadata}/entityDefs/OutboundEmail.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Metadata => Resources/metadata}/entityDefs/Preferences.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Metadata => Resources/metadata}/entityDefs/Role.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Metadata => Resources/metadata}/entityDefs/Settings.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Metadata => Resources/metadata}/entityDefs/Team.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Metadata => Resources/metadata}/entityDefs/User.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Metadata => Resources/metadata}/fields/address.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Metadata => Resources/metadata}/fields/array.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Metadata => Resources/metadata}/fields/autoincrement.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Metadata => Resources/metadata}/fields/base.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Metadata => Resources/metadata}/fields/bool.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Metadata => Resources/metadata}/fields/currency.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Metadata => Resources/metadata}/fields/date.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Metadata => Resources/metadata}/fields/datetime.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Metadata => Resources/metadata}/fields/email.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Metadata => Resources/metadata}/fields/enum.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Metadata => Resources/metadata}/fields/enumInt.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Metadata => Resources/metadata}/fields/float.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Metadata => Resources/metadata}/fields/int.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Metadata => Resources/metadata}/fields/link.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Metadata => Resources/metadata}/fields/linkMultiple.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Metadata => Resources/metadata}/fields/linkParent.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Metadata => Resources/metadata}/fields/multienum.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Metadata => Resources/metadata}/fields/password.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Metadata => Resources/metadata}/fields/personName.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Metadata => Resources/metadata}/fields/phone.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Metadata => Resources/metadata}/fields/text.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Metadata => Resources/metadata}/fields/url.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Metadata => Resources/metadata}/fields/varchar.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Metadata => Resources/metadata}/scopes/Attachment.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Metadata => Resources/metadata}/scopes/EmailTemplate.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Metadata => Resources/metadata}/scopes/Note.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Metadata => Resources/metadata}/scopes/OutboundEmail.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Metadata => Resources/metadata}/scopes/Role.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Metadata => Resources/metadata}/scopes/Team.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Metadata => Resources/metadata}/scopes/User.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Metadata => Resources/metadata}/viewDefs/EmailTemplate.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Metadata => Resources/metadata}/viewDefs/OutboundEmail.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Metadata => Resources/metadata}/viewDefs/Role.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Metadata => Resources/metadata}/viewDefs/Team.json (100%)
 mode change 100755 => 100644
 rename application/Espo/{Metadata => Resources/metadata}/viewDefs/User.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/account => Resources/layouts/Account}/detail.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/account => Resources/layouts/Account}/detailSmall.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/account => Resources/layouts/Account}/filters.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/account => Resources/layouts/Account}/filtersAdvanced.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/account => Resources/layouts/Account}/list.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/account => Resources/layouts/Account}/listSelect.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/account => Resources/layouts/Account}/listSmall.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/account => Resources/layouts/Account}/massUpdate.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/account => Resources/layouts/Account}/relationships.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/call => Resources/layouts/Call}/detail.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/call => Resources/layouts/Call}/detailSmall.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/call => Resources/layouts/Call}/filtersAdvanced.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/call => Resources/layouts/Call}/list.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/call => Resources/layouts/Call}/listSelect.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/call => Resources/layouts/Call}/listSmall.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/call => Resources/layouts/Call}/massUpdate.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/case => Resources/layouts/Case}/detail.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/case => Resources/layouts/Case}/detailSmall.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/case => Resources/layouts/Case}/filters.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/case => Resources/layouts/Case}/filtersAdvanced.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/case => Resources/layouts/Case}/list.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/case => Resources/layouts/Case}/listSmall.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/case => Resources/layouts/Case}/massUpdate.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/case => Resources/layouts/Case}/relationships.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/contact => Resources/layouts/Contact}/detail.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/contact => Resources/layouts/Contact}/detailSmall.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/contact => Resources/layouts/Contact}/filters.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/contact => Resources/layouts/Contact}/filtersAdvanced.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/contact => Resources/layouts/Contact}/list.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/contact => Resources/layouts/Contact}/listSelect.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/contact => Resources/layouts/Contact}/listSmall.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/contact => Resources/layouts/Contact}/relationships.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/email => Resources/layouts/Email}/detail.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/email => Resources/layouts/Email}/detailSmall.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/emailTemplate => Resources/layouts/EmailTemplate}/detail.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/emailTemplate => Resources/layouts/EmailTemplate}/detailSmall.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/emailTemplate => Resources/layouts/EmailTemplate}/filtersAdvanced.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/inboundEmail => Resources/layouts/InboundEmail}/detail.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/inboundEmail => Resources/layouts/InboundEmail}/list.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/lead => Resources/layouts/Lead}/detail.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/lead => Resources/layouts/Lead}/detailSmall.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/lead => Resources/layouts/Lead}/filters.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/lead => Resources/layouts/Lead}/filtersAdvanced.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/lead => Resources/layouts/Lead}/list.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/lead => Resources/layouts/Lead}/listDashlet.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/lead => Resources/layouts/Lead}/listSelect.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/lead => Resources/layouts/Lead}/listSmall.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/lead => Resources/layouts/Lead}/massUpdate.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/lead => Resources/layouts/Lead}/relationships.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/meeting => Resources/layouts/Meeting}/detail.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/meeting => Resources/layouts/Meeting}/detailSmall.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/meeting => Resources/layouts/Meeting}/filtersAdvanced.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/meeting => Resources/layouts/Meeting}/list.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/meeting => Resources/layouts/Meeting}/listSelect.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/meeting => Resources/layouts/Meeting}/listSmall.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/meeting => Resources/layouts/Meeting}/massUpdate.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/opportunity => Resources/layouts/Opportunity}/detail.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/opportunity => Resources/layouts/Opportunity}/detailSmall.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/opportunity => Resources/layouts/Opportunity}/filtersAdvanced.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/opportunity => Resources/layouts/Opportunity}/list.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/opportunity => Resources/layouts/Opportunity}/listSelect.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/opportunity => Resources/layouts/Opportunity}/listSmall.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/opportunity => Resources/layouts/Opportunity}/massUpdate.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/opportunity => Resources/layouts/Opportunity}/relationships.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/prospect => Resources/layouts/Prospect}/detail.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/prospect => Resources/layouts/Prospect}/detailSmall.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/prospect => Resources/layouts/Prospect}/filters.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/prospect => Resources/layouts/Prospect}/filtersAdvanced.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/prospect => Resources/layouts/Prospect}/list.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/prospect => Resources/layouts/Prospect}/listSmall.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/prospect => Resources/layouts/Prospect}/massUpdate.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/prospect => Resources/layouts/Prospect}/relationships.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/task => Resources/layouts/Task}/detail.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/task => Resources/layouts/Task}/detailSmall.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/task => Resources/layouts/Task}/filtersAdvanced.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/task => Resources/layouts/Task}/list.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/task => Resources/layouts/Task}/listSelect.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/task => Resources/layouts/Task}/listSmall.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/task => Resources/layouts/Task}/massUpdate.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Layouts/task => Resources/layouts/Task}/relationships.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Metadata => Resources/metadata}/dashlets/Calendar.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Metadata => Resources/metadata}/dashlets/Cases.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Metadata => Resources/metadata}/dashlets/Leads.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Metadata => Resources/metadata}/dashlets/Opportunities.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Metadata => Resources/metadata}/dashlets/OpportunitiesByLeadSource.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Metadata => Resources/metadata}/dashlets/OpportunitiesByStage.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Metadata => Resources/metadata}/dashlets/SalesByMonth.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Metadata => Resources/metadata}/dashlets/SalesPipeline.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Metadata => Resources/metadata}/dashlets/Tasks.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Metadata => Resources/metadata}/defs/Contact.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Metadata => Resources/metadata}/defs/Product.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Metadata => Resources/metadata}/defs/unset.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Metadata => Resources/metadata}/entityDefs/Account.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Metadata => Resources/metadata}/entityDefs/Call.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Metadata => Resources/metadata}/entityDefs/Case.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Metadata => Resources/metadata}/entityDefs/Contact.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Metadata => Resources/metadata}/entityDefs/Email.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Metadata => Resources/metadata}/entityDefs/InboundEmail.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Metadata => Resources/metadata}/entityDefs/Lead.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Metadata => Resources/metadata}/entityDefs/Meeting.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Metadata => Resources/metadata}/entityDefs/Opportunity.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Metadata => Resources/metadata}/entityDefs/Prospect.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Metadata => Resources/metadata}/entityDefs/Task.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Metadata => Resources/metadata}/scopes/Account.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Metadata => Resources/metadata}/scopes/Calendar.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Metadata => Resources/metadata}/scopes/Call.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Metadata => Resources/metadata}/scopes/Case.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Metadata => Resources/metadata}/scopes/Contact.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Metadata => Resources/metadata}/scopes/Email.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Metadata => Resources/metadata}/scopes/InboundEmail.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Metadata => Resources/metadata}/scopes/Lead.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Metadata => Resources/metadata}/scopes/Meeting.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Metadata => Resources/metadata}/scopes/Opportunity.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Metadata => Resources/metadata}/scopes/Prospect.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Metadata => Resources/metadata}/scopes/Task.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Metadata => Resources/metadata}/viewDefs/Account.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Metadata => Resources/metadata}/viewDefs/Call.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Metadata => Resources/metadata}/viewDefs/Case.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Metadata => Resources/metadata}/viewDefs/Contact.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Metadata => Resources/metadata}/viewDefs/InboundEmail.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Metadata => Resources/metadata}/viewDefs/Lead.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Metadata => Resources/metadata}/viewDefs/Meeting.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Metadata => Resources/metadata}/viewDefs/Opportunity.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Metadata => Resources/metadata}/viewDefs/Prospect.json (100%)
 mode change 100755 => 100644
 rename application/Modules/Crm/{Metadata => Resources/metadata}/viewDefs/Task.json (100%)
 mode change 100755 => 100644

diff --git a/.gitignore b/.gitignore
index 1e01c1f017..896c71bb7d 100755
--- a/.gitignore
+++ b/.gitignore
@@ -3,9 +3,9 @@ data/cache/*
 application/config.php
 /test.php
 /test2.php
-application/Espo/Metadata/scopes/CustomTest.json
-application/Espo/Metadata/customTest/*
-application/Espo/Layouts/customTest/*
-application/Modules/Crm/Metadata/customTest/*
-application/Modules/Crm/Layouts/customTest/*
-
+application/Espo/Resources/metadata/scopes/CustomTest.json
+application/Modules/Crm/Resources/metadata/scopes/CustomTest.json
+application/Espo/Resources/layouts/CustomTest/*
+application/Modules/Crm/Resources/layouts/CustomTest/*
+application/Espo/Resources/metadata/customTest/*
+application/Modules/Crm/Resources/metadata/customTest/*
\ No newline at end of file
diff --git a/application/Espo/Core/Application.php b/application/Espo/Core/Application.php
index 522416a7bf..2cddce3224 100644
--- a/application/Espo/Core/Application.php
+++ b/application/Espo/Core/Application.php
@@ -96,11 +96,15 @@ class Application
 		//convert all url params to camel case format
 		$this->getSlim()->hook('slim.before.dispatch', function () use ($slim, $container) {
 
-			$routeParams= $slim->router()->getCurrentRoute()->getParams();
+			$conditions = $slim->router()->getCurrentRoute()->getConditions();
+			$upperList = isset($conditions['upper']) ? $conditions['upper'] : array();
+
+            $routeParams= $slim->router()->getCurrentRoute()->getParams();
 
 			if (!empty($routeParams)) {
-				foreach($routeParams as &$param) {
-					$param= \Espo\Core\Utils\Util::toCamelCase($param);
+				foreach($routeParams as $name => &$param) {
+                    $isUpper = in_array($name, $upperList) ? true : false;
+					$param= \Espo\Core\Utils\Util::toCamelCase($param, $isUpper);
 				}
 
 			    $slim->router()->getCurrentRoute()->setParams($routeParams);
@@ -187,7 +191,7 @@ EOT;
 				'scope' => ':scope',
 				'action' => ':type',
 			);
-		});
+		})->conditions( array('upper' => array('scope')) );
 		//END: METADATA
 
 		//SETTINGS
@@ -211,7 +215,7 @@ EOT;
 				'scope' => ':controller',
 				'action' => ':name',
 			);
-		});
+		})->conditions( array('upper' => array('controller')) );
 
 		$this->getSlim()->put('/:controller/layout/:name/', function() {
 			return array(
@@ -219,7 +223,7 @@ EOT;
 				'scope' => ':controller',
 				'action' => ':name',
 			);
-		});
+		})->conditions( array('upper' => array('controller')) );
 
 		$this->getSlim()->map('/:controller/layout/:name/', function() {
 			return array(
@@ -227,7 +231,7 @@ EOT;
 				'scope' => ':controller',
 				'action' => ':name',
 			);
-		})->via('PATCH');
+		})->via('PATCH')->conditions( array('upper' => array('controller')) );
 		//END: LAYOUT
 
 
diff --git a/application/Espo/Core/defaults/systemConfig.php b/application/Espo/Core/defaults/systemConfig.php
index 05897de879..f8065b7304 100755
--- a/application/Espo/Core/defaults/systemConfig.php
+++ b/application/Espo/Core/defaults/systemConfig.php
@@ -18,16 +18,16 @@ return array (
   array (
     'name' => 'metadata',
     'cachePath' => 'data/cache/application',
-    'corePath' => 'application/Espo/Metadata',
-    'customPath' => 'application/Modules/{*}/Metadata',
+    'corePath' => 'application/Espo/Resources/metadata',
+    'customPath' => 'application/Modules/{*}/Resources/metadata',
     'doctrineCache' => 'data/cache/doctrine/metadata',
   ),
 
   'layoutConfig' =>
   array (
     'name' => 'layouts',
-    'corePath' => 'application/Espo/Layouts',
-    'customPath' => 'application/Modules/{*}/Layouts',
+    'corePath' => 'application/Espo/Resources/layouts',
+    'customPath' => 'application/Modules/{*}/Resources/layouts',
   ),
 
   'languageConfig' =>
diff --git a/application/Espo/Layouts/app/settings.json b/application/Espo/Resources/layouts/App/settings.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Layouts/app/settings.json
rename to application/Espo/Resources/layouts/App/settings.json
diff --git a/application/Espo/Layouts/home/dashlets.json b/application/Espo/Resources/layouts/Home/dashlets.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Layouts/home/dashlets.json
rename to application/Espo/Resources/layouts/Home/dashlets.json
diff --git a/application/Espo/Layouts/outboundEmail/detail.json b/application/Espo/Resources/layouts/OutboundEmail/detail.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Layouts/outboundEmail/detail.json
rename to application/Espo/Resources/layouts/OutboundEmail/detail.json
diff --git a/application/Espo/Layouts/preferences/detail.json b/application/Espo/Resources/layouts/Preferences/detail.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Layouts/preferences/detail.json
rename to application/Espo/Resources/layouts/Preferences/detail.json
diff --git a/application/Espo/Layouts/role/relationships.json b/application/Espo/Resources/layouts/Role/relationships.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Layouts/role/relationships.json
rename to application/Espo/Resources/layouts/Role/relationships.json
diff --git a/application/Espo/Layouts/settings/outboundEmail.json b/application/Espo/Resources/layouts/Settings/outboundEmail.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Layouts/settings/outboundEmail.json
rename to application/Espo/Resources/layouts/Settings/outboundEmail.json
diff --git a/application/Espo/Layouts/settings/settings.json b/application/Espo/Resources/layouts/Settings/settings.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Layouts/settings/settings.json
rename to application/Espo/Resources/layouts/Settings/settings.json
diff --git a/application/Espo/Layouts/settings/userInterface.json b/application/Espo/Resources/layouts/Settings/userInterface.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Layouts/settings/userInterface.json
rename to application/Espo/Resources/layouts/Settings/userInterface.json
diff --git a/application/Espo/Layouts/team/relationships.json b/application/Espo/Resources/layouts/Team/relationships.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Layouts/team/relationships.json
rename to application/Espo/Resources/layouts/Team/relationships.json
diff --git a/application/Espo/Layouts/user/detail.json b/application/Espo/Resources/layouts/User/detail.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Layouts/user/detail.json
rename to application/Espo/Resources/layouts/User/detail.json
diff --git a/application/Espo/Layouts/user/detailSmall.json b/application/Espo/Resources/layouts/User/detailSmall.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Layouts/user/detailSmall.json
rename to application/Espo/Resources/layouts/User/detailSmall.json
diff --git a/application/Espo/Layouts/user/filters.json b/application/Espo/Resources/layouts/User/filters.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Layouts/user/filters.json
rename to application/Espo/Resources/layouts/User/filters.json
diff --git a/application/Espo/Layouts/user/filtersAdvanced.json b/application/Espo/Resources/layouts/User/filtersAdvanced.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Layouts/user/filtersAdvanced.json
rename to application/Espo/Resources/layouts/User/filtersAdvanced.json
diff --git a/application/Espo/Layouts/user/list.json b/application/Espo/Resources/layouts/User/list.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Layouts/user/list.json
rename to application/Espo/Resources/layouts/User/list.json
diff --git a/application/Espo/Layouts/user/listSmall.json b/application/Espo/Resources/layouts/User/listSmall.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Layouts/user/listSmall.json
rename to application/Espo/Resources/layouts/User/listSmall.json
diff --git a/application/Espo/Layouts/user/massUpdate.json b/application/Espo/Resources/layouts/User/massUpdate.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Layouts/user/massUpdate.json
rename to application/Espo/Resources/layouts/User/massUpdate.json
diff --git a/application/Espo/Metadata/app/adminPanel.json b/application/Espo/Resources/metadata/app/AdminPanel.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Metadata/app/adminPanel.json
rename to application/Espo/Resources/metadata/app/AdminPanel.json
diff --git a/application/Espo/Metadata/dashlets/Stream.json b/application/Espo/Resources/metadata/dashlets/Stream.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Metadata/dashlets/Stream.json
rename to application/Espo/Resources/metadata/dashlets/Stream.json
diff --git a/application/Espo/Metadata/defs/Bug.json b/application/Espo/Resources/metadata/defs/Bug.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Metadata/defs/Bug.json
rename to application/Espo/Resources/metadata/defs/Bug.json
diff --git a/application/Espo/Metadata/defs/User.json b/application/Espo/Resources/metadata/defs/User.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Metadata/defs/User.json
rename to application/Espo/Resources/metadata/defs/User.json
diff --git a/application/Espo/Metadata/entityDefs/Attachment.json b/application/Espo/Resources/metadata/entityDefs/Attachment.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Metadata/entityDefs/Attachment.json
rename to application/Espo/Resources/metadata/entityDefs/Attachment.json
diff --git a/application/Espo/Metadata/entityDefs/EmailTemplate.json b/application/Espo/Resources/metadata/entityDefs/EmailTemplate.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Metadata/entityDefs/EmailTemplate.json
rename to application/Espo/Resources/metadata/entityDefs/EmailTemplate.json
diff --git a/application/Espo/Metadata/entityDefs/Note.json b/application/Espo/Resources/metadata/entityDefs/Note.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Metadata/entityDefs/Note.json
rename to application/Espo/Resources/metadata/entityDefs/Note.json
diff --git a/application/Espo/Metadata/entityDefs/OutboundEmail.json b/application/Espo/Resources/metadata/entityDefs/OutboundEmail.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Metadata/entityDefs/OutboundEmail.json
rename to application/Espo/Resources/metadata/entityDefs/OutboundEmail.json
diff --git a/application/Espo/Metadata/entityDefs/Preferences.json b/application/Espo/Resources/metadata/entityDefs/Preferences.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Metadata/entityDefs/Preferences.json
rename to application/Espo/Resources/metadata/entityDefs/Preferences.json
diff --git a/application/Espo/Metadata/entityDefs/Role.json b/application/Espo/Resources/metadata/entityDefs/Role.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Metadata/entityDefs/Role.json
rename to application/Espo/Resources/metadata/entityDefs/Role.json
diff --git a/application/Espo/Metadata/entityDefs/Settings.json b/application/Espo/Resources/metadata/entityDefs/Settings.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Metadata/entityDefs/Settings.json
rename to application/Espo/Resources/metadata/entityDefs/Settings.json
diff --git a/application/Espo/Metadata/entityDefs/Team.json b/application/Espo/Resources/metadata/entityDefs/Team.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Metadata/entityDefs/Team.json
rename to application/Espo/Resources/metadata/entityDefs/Team.json
diff --git a/application/Espo/Metadata/entityDefs/User.json b/application/Espo/Resources/metadata/entityDefs/User.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Metadata/entityDefs/User.json
rename to application/Espo/Resources/metadata/entityDefs/User.json
diff --git a/application/Espo/Metadata/fields/address.json b/application/Espo/Resources/metadata/fields/address.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Metadata/fields/address.json
rename to application/Espo/Resources/metadata/fields/address.json
diff --git a/application/Espo/Metadata/fields/array.json b/application/Espo/Resources/metadata/fields/array.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Metadata/fields/array.json
rename to application/Espo/Resources/metadata/fields/array.json
diff --git a/application/Espo/Metadata/fields/autoincrement.json b/application/Espo/Resources/metadata/fields/autoincrement.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Metadata/fields/autoincrement.json
rename to application/Espo/Resources/metadata/fields/autoincrement.json
diff --git a/application/Espo/Metadata/fields/base.json b/application/Espo/Resources/metadata/fields/base.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Metadata/fields/base.json
rename to application/Espo/Resources/metadata/fields/base.json
diff --git a/application/Espo/Metadata/fields/bool.json b/application/Espo/Resources/metadata/fields/bool.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Metadata/fields/bool.json
rename to application/Espo/Resources/metadata/fields/bool.json
diff --git a/application/Espo/Metadata/fields/currency.json b/application/Espo/Resources/metadata/fields/currency.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Metadata/fields/currency.json
rename to application/Espo/Resources/metadata/fields/currency.json
diff --git a/application/Espo/Metadata/fields/date.json b/application/Espo/Resources/metadata/fields/date.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Metadata/fields/date.json
rename to application/Espo/Resources/metadata/fields/date.json
diff --git a/application/Espo/Metadata/fields/datetime.json b/application/Espo/Resources/metadata/fields/datetime.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Metadata/fields/datetime.json
rename to application/Espo/Resources/metadata/fields/datetime.json
diff --git a/application/Espo/Metadata/fields/email.json b/application/Espo/Resources/metadata/fields/email.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Metadata/fields/email.json
rename to application/Espo/Resources/metadata/fields/email.json
diff --git a/application/Espo/Metadata/fields/enum.json b/application/Espo/Resources/metadata/fields/enum.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Metadata/fields/enum.json
rename to application/Espo/Resources/metadata/fields/enum.json
diff --git a/application/Espo/Metadata/fields/enumInt.json b/application/Espo/Resources/metadata/fields/enumInt.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Metadata/fields/enumInt.json
rename to application/Espo/Resources/metadata/fields/enumInt.json
diff --git a/application/Espo/Metadata/fields/float.json b/application/Espo/Resources/metadata/fields/float.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Metadata/fields/float.json
rename to application/Espo/Resources/metadata/fields/float.json
diff --git a/application/Espo/Metadata/fields/int.json b/application/Espo/Resources/metadata/fields/int.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Metadata/fields/int.json
rename to application/Espo/Resources/metadata/fields/int.json
diff --git a/application/Espo/Metadata/fields/link.json b/application/Espo/Resources/metadata/fields/link.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Metadata/fields/link.json
rename to application/Espo/Resources/metadata/fields/link.json
diff --git a/application/Espo/Metadata/fields/linkMultiple.json b/application/Espo/Resources/metadata/fields/linkMultiple.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Metadata/fields/linkMultiple.json
rename to application/Espo/Resources/metadata/fields/linkMultiple.json
diff --git a/application/Espo/Metadata/fields/linkParent.json b/application/Espo/Resources/metadata/fields/linkParent.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Metadata/fields/linkParent.json
rename to application/Espo/Resources/metadata/fields/linkParent.json
diff --git a/application/Espo/Metadata/fields/multienum.json b/application/Espo/Resources/metadata/fields/multienum.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Metadata/fields/multienum.json
rename to application/Espo/Resources/metadata/fields/multienum.json
diff --git a/application/Espo/Metadata/fields/password.json b/application/Espo/Resources/metadata/fields/password.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Metadata/fields/password.json
rename to application/Espo/Resources/metadata/fields/password.json
diff --git a/application/Espo/Metadata/fields/personName.json b/application/Espo/Resources/metadata/fields/personName.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Metadata/fields/personName.json
rename to application/Espo/Resources/metadata/fields/personName.json
diff --git a/application/Espo/Metadata/fields/phone.json b/application/Espo/Resources/metadata/fields/phone.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Metadata/fields/phone.json
rename to application/Espo/Resources/metadata/fields/phone.json
diff --git a/application/Espo/Metadata/fields/text.json b/application/Espo/Resources/metadata/fields/text.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Metadata/fields/text.json
rename to application/Espo/Resources/metadata/fields/text.json
diff --git a/application/Espo/Metadata/fields/url.json b/application/Espo/Resources/metadata/fields/url.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Metadata/fields/url.json
rename to application/Espo/Resources/metadata/fields/url.json
diff --git a/application/Espo/Metadata/fields/varchar.json b/application/Espo/Resources/metadata/fields/varchar.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Metadata/fields/varchar.json
rename to application/Espo/Resources/metadata/fields/varchar.json
diff --git a/application/Espo/Metadata/scopes/Attachment.json b/application/Espo/Resources/metadata/scopes/Attachment.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Metadata/scopes/Attachment.json
rename to application/Espo/Resources/metadata/scopes/Attachment.json
diff --git a/application/Espo/Metadata/scopes/EmailTemplate.json b/application/Espo/Resources/metadata/scopes/EmailTemplate.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Metadata/scopes/EmailTemplate.json
rename to application/Espo/Resources/metadata/scopes/EmailTemplate.json
diff --git a/application/Espo/Metadata/scopes/Note.json b/application/Espo/Resources/metadata/scopes/Note.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Metadata/scopes/Note.json
rename to application/Espo/Resources/metadata/scopes/Note.json
diff --git a/application/Espo/Metadata/scopes/OutboundEmail.json b/application/Espo/Resources/metadata/scopes/OutboundEmail.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Metadata/scopes/OutboundEmail.json
rename to application/Espo/Resources/metadata/scopes/OutboundEmail.json
diff --git a/application/Espo/Metadata/scopes/Role.json b/application/Espo/Resources/metadata/scopes/Role.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Metadata/scopes/Role.json
rename to application/Espo/Resources/metadata/scopes/Role.json
diff --git a/application/Espo/Metadata/scopes/Team.json b/application/Espo/Resources/metadata/scopes/Team.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Metadata/scopes/Team.json
rename to application/Espo/Resources/metadata/scopes/Team.json
diff --git a/application/Espo/Metadata/scopes/User.json b/application/Espo/Resources/metadata/scopes/User.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Metadata/scopes/User.json
rename to application/Espo/Resources/metadata/scopes/User.json
diff --git a/application/Espo/Metadata/viewDefs/EmailTemplate.json b/application/Espo/Resources/metadata/viewDefs/EmailTemplate.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Metadata/viewDefs/EmailTemplate.json
rename to application/Espo/Resources/metadata/viewDefs/EmailTemplate.json
diff --git a/application/Espo/Metadata/viewDefs/OutboundEmail.json b/application/Espo/Resources/metadata/viewDefs/OutboundEmail.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Metadata/viewDefs/OutboundEmail.json
rename to application/Espo/Resources/metadata/viewDefs/OutboundEmail.json
diff --git a/application/Espo/Metadata/viewDefs/Role.json b/application/Espo/Resources/metadata/viewDefs/Role.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Metadata/viewDefs/Role.json
rename to application/Espo/Resources/metadata/viewDefs/Role.json
diff --git a/application/Espo/Metadata/viewDefs/Team.json b/application/Espo/Resources/metadata/viewDefs/Team.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Metadata/viewDefs/Team.json
rename to application/Espo/Resources/metadata/viewDefs/Team.json
diff --git a/application/Espo/Metadata/viewDefs/User.json b/application/Espo/Resources/metadata/viewDefs/User.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Espo/Metadata/viewDefs/User.json
rename to application/Espo/Resources/metadata/viewDefs/User.json
diff --git a/application/Modules/Crm/Layouts/account/detail.json b/application/Modules/Crm/Resources/layouts/Account/detail.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/account/detail.json
rename to application/Modules/Crm/Resources/layouts/Account/detail.json
diff --git a/application/Modules/Crm/Layouts/account/detailSmall.json b/application/Modules/Crm/Resources/layouts/Account/detailSmall.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/account/detailSmall.json
rename to application/Modules/Crm/Resources/layouts/Account/detailSmall.json
diff --git a/application/Modules/Crm/Layouts/account/filters.json b/application/Modules/Crm/Resources/layouts/Account/filters.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/account/filters.json
rename to application/Modules/Crm/Resources/layouts/Account/filters.json
diff --git a/application/Modules/Crm/Layouts/account/filtersAdvanced.json b/application/Modules/Crm/Resources/layouts/Account/filtersAdvanced.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/account/filtersAdvanced.json
rename to application/Modules/Crm/Resources/layouts/Account/filtersAdvanced.json
diff --git a/application/Modules/Crm/Layouts/account/list.json b/application/Modules/Crm/Resources/layouts/Account/list.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/account/list.json
rename to application/Modules/Crm/Resources/layouts/Account/list.json
diff --git a/application/Modules/Crm/Layouts/account/listSelect.json b/application/Modules/Crm/Resources/layouts/Account/listSelect.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/account/listSelect.json
rename to application/Modules/Crm/Resources/layouts/Account/listSelect.json
diff --git a/application/Modules/Crm/Layouts/account/listSmall.json b/application/Modules/Crm/Resources/layouts/Account/listSmall.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/account/listSmall.json
rename to application/Modules/Crm/Resources/layouts/Account/listSmall.json
diff --git a/application/Modules/Crm/Layouts/account/massUpdate.json b/application/Modules/Crm/Resources/layouts/Account/massUpdate.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/account/massUpdate.json
rename to application/Modules/Crm/Resources/layouts/Account/massUpdate.json
diff --git a/application/Modules/Crm/Layouts/account/relationships.json b/application/Modules/Crm/Resources/layouts/Account/relationships.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/account/relationships.json
rename to application/Modules/Crm/Resources/layouts/Account/relationships.json
diff --git a/application/Modules/Crm/Layouts/call/detail.json b/application/Modules/Crm/Resources/layouts/Call/detail.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/call/detail.json
rename to application/Modules/Crm/Resources/layouts/Call/detail.json
diff --git a/application/Modules/Crm/Layouts/call/detailSmall.json b/application/Modules/Crm/Resources/layouts/Call/detailSmall.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/call/detailSmall.json
rename to application/Modules/Crm/Resources/layouts/Call/detailSmall.json
diff --git a/application/Modules/Crm/Layouts/call/filtersAdvanced.json b/application/Modules/Crm/Resources/layouts/Call/filtersAdvanced.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/call/filtersAdvanced.json
rename to application/Modules/Crm/Resources/layouts/Call/filtersAdvanced.json
diff --git a/application/Modules/Crm/Layouts/call/list.json b/application/Modules/Crm/Resources/layouts/Call/list.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/call/list.json
rename to application/Modules/Crm/Resources/layouts/Call/list.json
diff --git a/application/Modules/Crm/Layouts/call/listSelect.json b/application/Modules/Crm/Resources/layouts/Call/listSelect.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/call/listSelect.json
rename to application/Modules/Crm/Resources/layouts/Call/listSelect.json
diff --git a/application/Modules/Crm/Layouts/call/listSmall.json b/application/Modules/Crm/Resources/layouts/Call/listSmall.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/call/listSmall.json
rename to application/Modules/Crm/Resources/layouts/Call/listSmall.json
diff --git a/application/Modules/Crm/Layouts/call/massUpdate.json b/application/Modules/Crm/Resources/layouts/Call/massUpdate.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/call/massUpdate.json
rename to application/Modules/Crm/Resources/layouts/Call/massUpdate.json
diff --git a/application/Modules/Crm/Layouts/case/detail.json b/application/Modules/Crm/Resources/layouts/Case/detail.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/case/detail.json
rename to application/Modules/Crm/Resources/layouts/Case/detail.json
diff --git a/application/Modules/Crm/Layouts/case/detailSmall.json b/application/Modules/Crm/Resources/layouts/Case/detailSmall.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/case/detailSmall.json
rename to application/Modules/Crm/Resources/layouts/Case/detailSmall.json
diff --git a/application/Modules/Crm/Layouts/case/filters.json b/application/Modules/Crm/Resources/layouts/Case/filters.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/case/filters.json
rename to application/Modules/Crm/Resources/layouts/Case/filters.json
diff --git a/application/Modules/Crm/Layouts/case/filtersAdvanced.json b/application/Modules/Crm/Resources/layouts/Case/filtersAdvanced.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/case/filtersAdvanced.json
rename to application/Modules/Crm/Resources/layouts/Case/filtersAdvanced.json
diff --git a/application/Modules/Crm/Layouts/case/list.json b/application/Modules/Crm/Resources/layouts/Case/list.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/case/list.json
rename to application/Modules/Crm/Resources/layouts/Case/list.json
diff --git a/application/Modules/Crm/Layouts/case/listSmall.json b/application/Modules/Crm/Resources/layouts/Case/listSmall.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/case/listSmall.json
rename to application/Modules/Crm/Resources/layouts/Case/listSmall.json
diff --git a/application/Modules/Crm/Layouts/case/massUpdate.json b/application/Modules/Crm/Resources/layouts/Case/massUpdate.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/case/massUpdate.json
rename to application/Modules/Crm/Resources/layouts/Case/massUpdate.json
diff --git a/application/Modules/Crm/Layouts/case/relationships.json b/application/Modules/Crm/Resources/layouts/Case/relationships.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/case/relationships.json
rename to application/Modules/Crm/Resources/layouts/Case/relationships.json
diff --git a/application/Modules/Crm/Layouts/contact/detail.json b/application/Modules/Crm/Resources/layouts/Contact/detail.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/contact/detail.json
rename to application/Modules/Crm/Resources/layouts/Contact/detail.json
diff --git a/application/Modules/Crm/Layouts/contact/detailSmall.json b/application/Modules/Crm/Resources/layouts/Contact/detailSmall.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/contact/detailSmall.json
rename to application/Modules/Crm/Resources/layouts/Contact/detailSmall.json
diff --git a/application/Modules/Crm/Layouts/contact/filters.json b/application/Modules/Crm/Resources/layouts/Contact/filters.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/contact/filters.json
rename to application/Modules/Crm/Resources/layouts/Contact/filters.json
diff --git a/application/Modules/Crm/Layouts/contact/filtersAdvanced.json b/application/Modules/Crm/Resources/layouts/Contact/filtersAdvanced.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/contact/filtersAdvanced.json
rename to application/Modules/Crm/Resources/layouts/Contact/filtersAdvanced.json
diff --git a/application/Modules/Crm/Layouts/contact/list.json b/application/Modules/Crm/Resources/layouts/Contact/list.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/contact/list.json
rename to application/Modules/Crm/Resources/layouts/Contact/list.json
diff --git a/application/Modules/Crm/Layouts/contact/listSelect.json b/application/Modules/Crm/Resources/layouts/Contact/listSelect.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/contact/listSelect.json
rename to application/Modules/Crm/Resources/layouts/Contact/listSelect.json
diff --git a/application/Modules/Crm/Layouts/contact/listSmall.json b/application/Modules/Crm/Resources/layouts/Contact/listSmall.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/contact/listSmall.json
rename to application/Modules/Crm/Resources/layouts/Contact/listSmall.json
diff --git a/application/Modules/Crm/Layouts/contact/relationships.json b/application/Modules/Crm/Resources/layouts/Contact/relationships.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/contact/relationships.json
rename to application/Modules/Crm/Resources/layouts/Contact/relationships.json
diff --git a/application/Modules/Crm/Layouts/email/detail.json b/application/Modules/Crm/Resources/layouts/Email/detail.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/email/detail.json
rename to application/Modules/Crm/Resources/layouts/Email/detail.json
diff --git a/application/Modules/Crm/Layouts/email/detailSmall.json b/application/Modules/Crm/Resources/layouts/Email/detailSmall.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/email/detailSmall.json
rename to application/Modules/Crm/Resources/layouts/Email/detailSmall.json
diff --git a/application/Modules/Crm/Layouts/emailTemplate/detail.json b/application/Modules/Crm/Resources/layouts/EmailTemplate/detail.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/emailTemplate/detail.json
rename to application/Modules/Crm/Resources/layouts/EmailTemplate/detail.json
diff --git a/application/Modules/Crm/Layouts/emailTemplate/detailSmall.json b/application/Modules/Crm/Resources/layouts/EmailTemplate/detailSmall.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/emailTemplate/detailSmall.json
rename to application/Modules/Crm/Resources/layouts/EmailTemplate/detailSmall.json
diff --git a/application/Modules/Crm/Layouts/emailTemplate/filtersAdvanced.json b/application/Modules/Crm/Resources/layouts/EmailTemplate/filtersAdvanced.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/emailTemplate/filtersAdvanced.json
rename to application/Modules/Crm/Resources/layouts/EmailTemplate/filtersAdvanced.json
diff --git a/application/Modules/Crm/Layouts/inboundEmail/detail.json b/application/Modules/Crm/Resources/layouts/InboundEmail/detail.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/inboundEmail/detail.json
rename to application/Modules/Crm/Resources/layouts/InboundEmail/detail.json
diff --git a/application/Modules/Crm/Layouts/inboundEmail/list.json b/application/Modules/Crm/Resources/layouts/InboundEmail/list.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/inboundEmail/list.json
rename to application/Modules/Crm/Resources/layouts/InboundEmail/list.json
diff --git a/application/Modules/Crm/Layouts/lead/detail.json b/application/Modules/Crm/Resources/layouts/Lead/detail.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/lead/detail.json
rename to application/Modules/Crm/Resources/layouts/Lead/detail.json
diff --git a/application/Modules/Crm/Layouts/lead/detailSmall.json b/application/Modules/Crm/Resources/layouts/Lead/detailSmall.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/lead/detailSmall.json
rename to application/Modules/Crm/Resources/layouts/Lead/detailSmall.json
diff --git a/application/Modules/Crm/Layouts/lead/filters.json b/application/Modules/Crm/Resources/layouts/Lead/filters.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/lead/filters.json
rename to application/Modules/Crm/Resources/layouts/Lead/filters.json
diff --git a/application/Modules/Crm/Layouts/lead/filtersAdvanced.json b/application/Modules/Crm/Resources/layouts/Lead/filtersAdvanced.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/lead/filtersAdvanced.json
rename to application/Modules/Crm/Resources/layouts/Lead/filtersAdvanced.json
diff --git a/application/Modules/Crm/Layouts/lead/list.json b/application/Modules/Crm/Resources/layouts/Lead/list.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/lead/list.json
rename to application/Modules/Crm/Resources/layouts/Lead/list.json
diff --git a/application/Modules/Crm/Layouts/lead/listDashlet.json b/application/Modules/Crm/Resources/layouts/Lead/listDashlet.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/lead/listDashlet.json
rename to application/Modules/Crm/Resources/layouts/Lead/listDashlet.json
diff --git a/application/Modules/Crm/Layouts/lead/listSelect.json b/application/Modules/Crm/Resources/layouts/Lead/listSelect.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/lead/listSelect.json
rename to application/Modules/Crm/Resources/layouts/Lead/listSelect.json
diff --git a/application/Modules/Crm/Layouts/lead/listSmall.json b/application/Modules/Crm/Resources/layouts/Lead/listSmall.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/lead/listSmall.json
rename to application/Modules/Crm/Resources/layouts/Lead/listSmall.json
diff --git a/application/Modules/Crm/Layouts/lead/massUpdate.json b/application/Modules/Crm/Resources/layouts/Lead/massUpdate.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/lead/massUpdate.json
rename to application/Modules/Crm/Resources/layouts/Lead/massUpdate.json
diff --git a/application/Modules/Crm/Layouts/lead/relationships.json b/application/Modules/Crm/Resources/layouts/Lead/relationships.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/lead/relationships.json
rename to application/Modules/Crm/Resources/layouts/Lead/relationships.json
diff --git a/application/Modules/Crm/Layouts/meeting/detail.json b/application/Modules/Crm/Resources/layouts/Meeting/detail.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/meeting/detail.json
rename to application/Modules/Crm/Resources/layouts/Meeting/detail.json
diff --git a/application/Modules/Crm/Layouts/meeting/detailSmall.json b/application/Modules/Crm/Resources/layouts/Meeting/detailSmall.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/meeting/detailSmall.json
rename to application/Modules/Crm/Resources/layouts/Meeting/detailSmall.json
diff --git a/application/Modules/Crm/Layouts/meeting/filtersAdvanced.json b/application/Modules/Crm/Resources/layouts/Meeting/filtersAdvanced.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/meeting/filtersAdvanced.json
rename to application/Modules/Crm/Resources/layouts/Meeting/filtersAdvanced.json
diff --git a/application/Modules/Crm/Layouts/meeting/list.json b/application/Modules/Crm/Resources/layouts/Meeting/list.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/meeting/list.json
rename to application/Modules/Crm/Resources/layouts/Meeting/list.json
diff --git a/application/Modules/Crm/Layouts/meeting/listSelect.json b/application/Modules/Crm/Resources/layouts/Meeting/listSelect.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/meeting/listSelect.json
rename to application/Modules/Crm/Resources/layouts/Meeting/listSelect.json
diff --git a/application/Modules/Crm/Layouts/meeting/listSmall.json b/application/Modules/Crm/Resources/layouts/Meeting/listSmall.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/meeting/listSmall.json
rename to application/Modules/Crm/Resources/layouts/Meeting/listSmall.json
diff --git a/application/Modules/Crm/Layouts/meeting/massUpdate.json b/application/Modules/Crm/Resources/layouts/Meeting/massUpdate.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/meeting/massUpdate.json
rename to application/Modules/Crm/Resources/layouts/Meeting/massUpdate.json
diff --git a/application/Modules/Crm/Layouts/opportunity/detail.json b/application/Modules/Crm/Resources/layouts/Opportunity/detail.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/opportunity/detail.json
rename to application/Modules/Crm/Resources/layouts/Opportunity/detail.json
diff --git a/application/Modules/Crm/Layouts/opportunity/detailSmall.json b/application/Modules/Crm/Resources/layouts/Opportunity/detailSmall.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/opportunity/detailSmall.json
rename to application/Modules/Crm/Resources/layouts/Opportunity/detailSmall.json
diff --git a/application/Modules/Crm/Layouts/opportunity/filtersAdvanced.json b/application/Modules/Crm/Resources/layouts/Opportunity/filtersAdvanced.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/opportunity/filtersAdvanced.json
rename to application/Modules/Crm/Resources/layouts/Opportunity/filtersAdvanced.json
diff --git a/application/Modules/Crm/Layouts/opportunity/list.json b/application/Modules/Crm/Resources/layouts/Opportunity/list.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/opportunity/list.json
rename to application/Modules/Crm/Resources/layouts/Opportunity/list.json
diff --git a/application/Modules/Crm/Layouts/opportunity/listSelect.json b/application/Modules/Crm/Resources/layouts/Opportunity/listSelect.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/opportunity/listSelect.json
rename to application/Modules/Crm/Resources/layouts/Opportunity/listSelect.json
diff --git a/application/Modules/Crm/Layouts/opportunity/listSmall.json b/application/Modules/Crm/Resources/layouts/Opportunity/listSmall.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/opportunity/listSmall.json
rename to application/Modules/Crm/Resources/layouts/Opportunity/listSmall.json
diff --git a/application/Modules/Crm/Layouts/opportunity/massUpdate.json b/application/Modules/Crm/Resources/layouts/Opportunity/massUpdate.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/opportunity/massUpdate.json
rename to application/Modules/Crm/Resources/layouts/Opportunity/massUpdate.json
diff --git a/application/Modules/Crm/Layouts/opportunity/relationships.json b/application/Modules/Crm/Resources/layouts/Opportunity/relationships.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/opportunity/relationships.json
rename to application/Modules/Crm/Resources/layouts/Opportunity/relationships.json
diff --git a/application/Modules/Crm/Layouts/prospect/detail.json b/application/Modules/Crm/Resources/layouts/Prospect/detail.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/prospect/detail.json
rename to application/Modules/Crm/Resources/layouts/Prospect/detail.json
diff --git a/application/Modules/Crm/Layouts/prospect/detailSmall.json b/application/Modules/Crm/Resources/layouts/Prospect/detailSmall.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/prospect/detailSmall.json
rename to application/Modules/Crm/Resources/layouts/Prospect/detailSmall.json
diff --git a/application/Modules/Crm/Layouts/prospect/filters.json b/application/Modules/Crm/Resources/layouts/Prospect/filters.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/prospect/filters.json
rename to application/Modules/Crm/Resources/layouts/Prospect/filters.json
diff --git a/application/Modules/Crm/Layouts/prospect/filtersAdvanced.json b/application/Modules/Crm/Resources/layouts/Prospect/filtersAdvanced.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/prospect/filtersAdvanced.json
rename to application/Modules/Crm/Resources/layouts/Prospect/filtersAdvanced.json
diff --git a/application/Modules/Crm/Layouts/prospect/list.json b/application/Modules/Crm/Resources/layouts/Prospect/list.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/prospect/list.json
rename to application/Modules/Crm/Resources/layouts/Prospect/list.json
diff --git a/application/Modules/Crm/Layouts/prospect/listSmall.json b/application/Modules/Crm/Resources/layouts/Prospect/listSmall.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/prospect/listSmall.json
rename to application/Modules/Crm/Resources/layouts/Prospect/listSmall.json
diff --git a/application/Modules/Crm/Layouts/prospect/massUpdate.json b/application/Modules/Crm/Resources/layouts/Prospect/massUpdate.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/prospect/massUpdate.json
rename to application/Modules/Crm/Resources/layouts/Prospect/massUpdate.json
diff --git a/application/Modules/Crm/Layouts/prospect/relationships.json b/application/Modules/Crm/Resources/layouts/Prospect/relationships.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/prospect/relationships.json
rename to application/Modules/Crm/Resources/layouts/Prospect/relationships.json
diff --git a/application/Modules/Crm/Layouts/task/detail.json b/application/Modules/Crm/Resources/layouts/Task/detail.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/task/detail.json
rename to application/Modules/Crm/Resources/layouts/Task/detail.json
diff --git a/application/Modules/Crm/Layouts/task/detailSmall.json b/application/Modules/Crm/Resources/layouts/Task/detailSmall.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/task/detailSmall.json
rename to application/Modules/Crm/Resources/layouts/Task/detailSmall.json
diff --git a/application/Modules/Crm/Layouts/task/filtersAdvanced.json b/application/Modules/Crm/Resources/layouts/Task/filtersAdvanced.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/task/filtersAdvanced.json
rename to application/Modules/Crm/Resources/layouts/Task/filtersAdvanced.json
diff --git a/application/Modules/Crm/Layouts/task/list.json b/application/Modules/Crm/Resources/layouts/Task/list.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/task/list.json
rename to application/Modules/Crm/Resources/layouts/Task/list.json
diff --git a/application/Modules/Crm/Layouts/task/listSelect.json b/application/Modules/Crm/Resources/layouts/Task/listSelect.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/task/listSelect.json
rename to application/Modules/Crm/Resources/layouts/Task/listSelect.json
diff --git a/application/Modules/Crm/Layouts/task/listSmall.json b/application/Modules/Crm/Resources/layouts/Task/listSmall.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/task/listSmall.json
rename to application/Modules/Crm/Resources/layouts/Task/listSmall.json
diff --git a/application/Modules/Crm/Layouts/task/massUpdate.json b/application/Modules/Crm/Resources/layouts/Task/massUpdate.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/task/massUpdate.json
rename to application/Modules/Crm/Resources/layouts/Task/massUpdate.json
diff --git a/application/Modules/Crm/Layouts/task/relationships.json b/application/Modules/Crm/Resources/layouts/Task/relationships.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Layouts/task/relationships.json
rename to application/Modules/Crm/Resources/layouts/Task/relationships.json
diff --git a/application/Modules/Crm/Metadata/dashlets/Calendar.json b/application/Modules/Crm/Resources/metadata/dashlets/Calendar.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Metadata/dashlets/Calendar.json
rename to application/Modules/Crm/Resources/metadata/dashlets/Calendar.json
diff --git a/application/Modules/Crm/Metadata/dashlets/Cases.json b/application/Modules/Crm/Resources/metadata/dashlets/Cases.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Metadata/dashlets/Cases.json
rename to application/Modules/Crm/Resources/metadata/dashlets/Cases.json
diff --git a/application/Modules/Crm/Metadata/dashlets/Leads.json b/application/Modules/Crm/Resources/metadata/dashlets/Leads.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Metadata/dashlets/Leads.json
rename to application/Modules/Crm/Resources/metadata/dashlets/Leads.json
diff --git a/application/Modules/Crm/Metadata/dashlets/Opportunities.json b/application/Modules/Crm/Resources/metadata/dashlets/Opportunities.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Metadata/dashlets/Opportunities.json
rename to application/Modules/Crm/Resources/metadata/dashlets/Opportunities.json
diff --git a/application/Modules/Crm/Metadata/dashlets/OpportunitiesByLeadSource.json b/application/Modules/Crm/Resources/metadata/dashlets/OpportunitiesByLeadSource.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Metadata/dashlets/OpportunitiesByLeadSource.json
rename to application/Modules/Crm/Resources/metadata/dashlets/OpportunitiesByLeadSource.json
diff --git a/application/Modules/Crm/Metadata/dashlets/OpportunitiesByStage.json b/application/Modules/Crm/Resources/metadata/dashlets/OpportunitiesByStage.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Metadata/dashlets/OpportunitiesByStage.json
rename to application/Modules/Crm/Resources/metadata/dashlets/OpportunitiesByStage.json
diff --git a/application/Modules/Crm/Metadata/dashlets/SalesByMonth.json b/application/Modules/Crm/Resources/metadata/dashlets/SalesByMonth.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Metadata/dashlets/SalesByMonth.json
rename to application/Modules/Crm/Resources/metadata/dashlets/SalesByMonth.json
diff --git a/application/Modules/Crm/Metadata/dashlets/SalesPipeline.json b/application/Modules/Crm/Resources/metadata/dashlets/SalesPipeline.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Metadata/dashlets/SalesPipeline.json
rename to application/Modules/Crm/Resources/metadata/dashlets/SalesPipeline.json
diff --git a/application/Modules/Crm/Metadata/dashlets/Tasks.json b/application/Modules/Crm/Resources/metadata/dashlets/Tasks.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Metadata/dashlets/Tasks.json
rename to application/Modules/Crm/Resources/metadata/dashlets/Tasks.json
diff --git a/application/Modules/Crm/Metadata/defs/Contact.json b/application/Modules/Crm/Resources/metadata/defs/Contact.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Metadata/defs/Contact.json
rename to application/Modules/Crm/Resources/metadata/defs/Contact.json
diff --git a/application/Modules/Crm/Metadata/defs/Product.json b/application/Modules/Crm/Resources/metadata/defs/Product.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Metadata/defs/Product.json
rename to application/Modules/Crm/Resources/metadata/defs/Product.json
diff --git a/application/Modules/Crm/Metadata/defs/unset.json b/application/Modules/Crm/Resources/metadata/defs/unset.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Metadata/defs/unset.json
rename to application/Modules/Crm/Resources/metadata/defs/unset.json
diff --git a/application/Modules/Crm/Metadata/entityDefs/Account.json b/application/Modules/Crm/Resources/metadata/entityDefs/Account.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Metadata/entityDefs/Account.json
rename to application/Modules/Crm/Resources/metadata/entityDefs/Account.json
diff --git a/application/Modules/Crm/Metadata/entityDefs/Call.json b/application/Modules/Crm/Resources/metadata/entityDefs/Call.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Metadata/entityDefs/Call.json
rename to application/Modules/Crm/Resources/metadata/entityDefs/Call.json
diff --git a/application/Modules/Crm/Metadata/entityDefs/Case.json b/application/Modules/Crm/Resources/metadata/entityDefs/Case.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Metadata/entityDefs/Case.json
rename to application/Modules/Crm/Resources/metadata/entityDefs/Case.json
diff --git a/application/Modules/Crm/Metadata/entityDefs/Contact.json b/application/Modules/Crm/Resources/metadata/entityDefs/Contact.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Metadata/entityDefs/Contact.json
rename to application/Modules/Crm/Resources/metadata/entityDefs/Contact.json
diff --git a/application/Modules/Crm/Metadata/entityDefs/Email.json b/application/Modules/Crm/Resources/metadata/entityDefs/Email.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Metadata/entityDefs/Email.json
rename to application/Modules/Crm/Resources/metadata/entityDefs/Email.json
diff --git a/application/Modules/Crm/Metadata/entityDefs/InboundEmail.json b/application/Modules/Crm/Resources/metadata/entityDefs/InboundEmail.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Metadata/entityDefs/InboundEmail.json
rename to application/Modules/Crm/Resources/metadata/entityDefs/InboundEmail.json
diff --git a/application/Modules/Crm/Metadata/entityDefs/Lead.json b/application/Modules/Crm/Resources/metadata/entityDefs/Lead.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Metadata/entityDefs/Lead.json
rename to application/Modules/Crm/Resources/metadata/entityDefs/Lead.json
diff --git a/application/Modules/Crm/Metadata/entityDefs/Meeting.json b/application/Modules/Crm/Resources/metadata/entityDefs/Meeting.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Metadata/entityDefs/Meeting.json
rename to application/Modules/Crm/Resources/metadata/entityDefs/Meeting.json
diff --git a/application/Modules/Crm/Metadata/entityDefs/Opportunity.json b/application/Modules/Crm/Resources/metadata/entityDefs/Opportunity.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Metadata/entityDefs/Opportunity.json
rename to application/Modules/Crm/Resources/metadata/entityDefs/Opportunity.json
diff --git a/application/Modules/Crm/Metadata/entityDefs/Prospect.json b/application/Modules/Crm/Resources/metadata/entityDefs/Prospect.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Metadata/entityDefs/Prospect.json
rename to application/Modules/Crm/Resources/metadata/entityDefs/Prospect.json
diff --git a/application/Modules/Crm/Metadata/entityDefs/Task.json b/application/Modules/Crm/Resources/metadata/entityDefs/Task.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Metadata/entityDefs/Task.json
rename to application/Modules/Crm/Resources/metadata/entityDefs/Task.json
diff --git a/application/Modules/Crm/Metadata/scopes/Account.json b/application/Modules/Crm/Resources/metadata/scopes/Account.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Metadata/scopes/Account.json
rename to application/Modules/Crm/Resources/metadata/scopes/Account.json
diff --git a/application/Modules/Crm/Metadata/scopes/Calendar.json b/application/Modules/Crm/Resources/metadata/scopes/Calendar.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Metadata/scopes/Calendar.json
rename to application/Modules/Crm/Resources/metadata/scopes/Calendar.json
diff --git a/application/Modules/Crm/Metadata/scopes/Call.json b/application/Modules/Crm/Resources/metadata/scopes/Call.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Metadata/scopes/Call.json
rename to application/Modules/Crm/Resources/metadata/scopes/Call.json
diff --git a/application/Modules/Crm/Metadata/scopes/Case.json b/application/Modules/Crm/Resources/metadata/scopes/Case.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Metadata/scopes/Case.json
rename to application/Modules/Crm/Resources/metadata/scopes/Case.json
diff --git a/application/Modules/Crm/Metadata/scopes/Contact.json b/application/Modules/Crm/Resources/metadata/scopes/Contact.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Metadata/scopes/Contact.json
rename to application/Modules/Crm/Resources/metadata/scopes/Contact.json
diff --git a/application/Modules/Crm/Metadata/scopes/Email.json b/application/Modules/Crm/Resources/metadata/scopes/Email.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Metadata/scopes/Email.json
rename to application/Modules/Crm/Resources/metadata/scopes/Email.json
diff --git a/application/Modules/Crm/Metadata/scopes/InboundEmail.json b/application/Modules/Crm/Resources/metadata/scopes/InboundEmail.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Metadata/scopes/InboundEmail.json
rename to application/Modules/Crm/Resources/metadata/scopes/InboundEmail.json
diff --git a/application/Modules/Crm/Metadata/scopes/Lead.json b/application/Modules/Crm/Resources/metadata/scopes/Lead.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Metadata/scopes/Lead.json
rename to application/Modules/Crm/Resources/metadata/scopes/Lead.json
diff --git a/application/Modules/Crm/Metadata/scopes/Meeting.json b/application/Modules/Crm/Resources/metadata/scopes/Meeting.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Metadata/scopes/Meeting.json
rename to application/Modules/Crm/Resources/metadata/scopes/Meeting.json
diff --git a/application/Modules/Crm/Metadata/scopes/Opportunity.json b/application/Modules/Crm/Resources/metadata/scopes/Opportunity.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Metadata/scopes/Opportunity.json
rename to application/Modules/Crm/Resources/metadata/scopes/Opportunity.json
diff --git a/application/Modules/Crm/Metadata/scopes/Prospect.json b/application/Modules/Crm/Resources/metadata/scopes/Prospect.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Metadata/scopes/Prospect.json
rename to application/Modules/Crm/Resources/metadata/scopes/Prospect.json
diff --git a/application/Modules/Crm/Metadata/scopes/Task.json b/application/Modules/Crm/Resources/metadata/scopes/Task.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Metadata/scopes/Task.json
rename to application/Modules/Crm/Resources/metadata/scopes/Task.json
diff --git a/application/Modules/Crm/Metadata/viewDefs/Account.json b/application/Modules/Crm/Resources/metadata/viewDefs/Account.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Metadata/viewDefs/Account.json
rename to application/Modules/Crm/Resources/metadata/viewDefs/Account.json
diff --git a/application/Modules/Crm/Metadata/viewDefs/Call.json b/application/Modules/Crm/Resources/metadata/viewDefs/Call.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Metadata/viewDefs/Call.json
rename to application/Modules/Crm/Resources/metadata/viewDefs/Call.json
diff --git a/application/Modules/Crm/Metadata/viewDefs/Case.json b/application/Modules/Crm/Resources/metadata/viewDefs/Case.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Metadata/viewDefs/Case.json
rename to application/Modules/Crm/Resources/metadata/viewDefs/Case.json
diff --git a/application/Modules/Crm/Metadata/viewDefs/Contact.json b/application/Modules/Crm/Resources/metadata/viewDefs/Contact.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Metadata/viewDefs/Contact.json
rename to application/Modules/Crm/Resources/metadata/viewDefs/Contact.json
diff --git a/application/Modules/Crm/Metadata/viewDefs/InboundEmail.json b/application/Modules/Crm/Resources/metadata/viewDefs/InboundEmail.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Metadata/viewDefs/InboundEmail.json
rename to application/Modules/Crm/Resources/metadata/viewDefs/InboundEmail.json
diff --git a/application/Modules/Crm/Metadata/viewDefs/Lead.json b/application/Modules/Crm/Resources/metadata/viewDefs/Lead.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Metadata/viewDefs/Lead.json
rename to application/Modules/Crm/Resources/metadata/viewDefs/Lead.json
diff --git a/application/Modules/Crm/Metadata/viewDefs/Meeting.json b/application/Modules/Crm/Resources/metadata/viewDefs/Meeting.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Metadata/viewDefs/Meeting.json
rename to application/Modules/Crm/Resources/metadata/viewDefs/Meeting.json
diff --git a/application/Modules/Crm/Metadata/viewDefs/Opportunity.json b/application/Modules/Crm/Resources/metadata/viewDefs/Opportunity.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Metadata/viewDefs/Opportunity.json
rename to application/Modules/Crm/Resources/metadata/viewDefs/Opportunity.json
diff --git a/application/Modules/Crm/Metadata/viewDefs/Prospect.json b/application/Modules/Crm/Resources/metadata/viewDefs/Prospect.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Metadata/viewDefs/Prospect.json
rename to application/Modules/Crm/Resources/metadata/viewDefs/Prospect.json
diff --git a/application/Modules/Crm/Metadata/viewDefs/Task.json b/application/Modules/Crm/Resources/metadata/viewDefs/Task.json
old mode 100755
new mode 100644
similarity index 100%
rename from application/Modules/Crm/Metadata/viewDefs/Task.json
rename to application/Modules/Crm/Resources/metadata/viewDefs/Task.json
diff --git a/tests/Api/LayoutTest.php b/tests/Api/LayoutTest.php
index 4c74a16644..342af5c659 100644
--- a/tests/Api/LayoutTest.php
+++ b/tests/Api/LayoutTest.php
@@ -34,7 +34,7 @@ class LayoutTest extends \PHPUnit_Framework_TestCase
 		$this->assertTrue($this->fixture->isSuccess( $data ));
 
 		//check if file exists
-		$this->assertTrue(file_exists('application/Espo/Layouts/customTest/testPut.json'));
+		$this->assertTrue(file_exists('application/Espo/Resources/layouts/CustomTest/testPut.json'));
 	}
 
 	function testPatch()
@@ -46,7 +46,7 @@ class LayoutTest extends \PHPUnit_Framework_TestCase
 		$this->assertTrue($this->fixture->isSuccess( $data ));
 
 		//check if file exists
-		$this->assertTrue(file_exists('application/Espo/Layouts/customTest/testPatch.json'));
+		$this->assertTrue(file_exists('application/Espo/Resources/layouts/CustomTest/testPatch.json'));
 	}
 
 	function testGet()
diff --git a/tests/Api/MetadataTest.php b/tests/Api/MetadataTest.php
index 721ddcaa5e..f9e87d958a 100644
--- a/tests/Api/MetadataTest.php
+++ b/tests/Api/MetadataTest.php
@@ -42,7 +42,7 @@ class MetadataTest extends \PHPUnit_Framework_TestCase
 		$this->assertTrue($this->fixture->isSuccess( $data ));
 
 		//check if file exists
-		$this->assertTrue(file_exists('application/Modules/Crm/Metadata/customTest/account.json'));
+		$this->assertTrue(file_exists('application/Modules/Crm/Resources/metadata/customTest/Account.json'));
 
 
 		$this->fixture->setUrl('/metadata/custom-test/custom-test');
@@ -50,7 +50,7 @@ class MetadataTest extends \PHPUnit_Framework_TestCase
 		$this->assertTrue($this->fixture->isSuccess( $data ));
 
 		//check if file exists
-		$this->assertTrue(file_exists('application/Espo/Metadata/customTest/customTest.json'));
+		$this->assertTrue(file_exists('application/Espo/Resources/metadata/customTest/CustomTest.json'));
 	}