More simplifying and clarification.
Moving declaration files to resources dir