Fixes specs; Minor Refactors; Moves words database to database directory