Changed directory structure and added cmake configs