Rename some stuff.. Gonna try to switch to autotools soon