Changed folder structure, began work on sqllite datalayer