Changed structure (again) to make sencha build possible