Still cleaning project + adding dependencies