added support for companyName DB column and improved directory structure