Cleaned up file structure, Added Maven dependencies