Added specs and moved files around