Trying to improve modules location