ENH: Changed directory structure a little bit and made properties file