added data directory and moved properties.py, data.py into it
updated import statements to accomodate new data directory