Second commit

Code organization. BoW