added rockspec and moved stuff around